Revert "Applying Moof's pull request from https://github.com/ooyala/barkeep/pull/500.patch"

This reverts commit 70452348ac54d1e0c17fd8b71899b438764d0654.