Revert e6b2beb..2fc5c88

This rolls back to commit e6b2beb36b645dd556e85d2e1c29ef16a297fc49.