Revert "commit and be happy"

This reverts commit b35ac6851ac3df931f5a6e2c442eda95a8009e3f.