revert bad changes #1

This reverts commit 2b098625cb056a03448783506f6fc01573cf45c5.
Get changes pushed to live.