Revert e1842ec..cd98352

This rolls back to commit e1842ecf604ec807e960ae4dcc8f4aaa31456b29.