Revert 877736d..49deaef

This rolls back to commit 877736dc77c942a22308c45d70572cdc7c66e34b.