Revert "Merge branch 'master' of https://github.com/WarrenGreen/petulant-hipster"

This reverts commit 82e54eb307ccb837da141e0cff1f7291574b5fda, reversing
changes made to 91d80b97c31d6d500c32ee97aaf995f57d911cac.