Revert "Merge branch 'master' of github.com:payola/Payola"

This reverts commit c0cbbf86c261cfb695e0a0b5431c39d85bd59d6a, reversing
changes made to 45e6533ecde435c1768816d9e93d065d9f46644e.
commit reverting