Revert e9fafeb..21f936f

This rolls back to commit e9fafeb6f2a320085c2ff2e6e8e219ecf5e8d3ae.