Revert 7c415ac..4ad837f

This rolls back to commit 7c415acb1a0090a04b4cf41c50ca80e05186c378.