Revert 8ed38df..3150d43

This rolls back to commit 8ed38dfd91239f2b551c781847c60214ff36c814.