Revert 9e932a6..b89ca2d

This rolls back to commit 9e932a66ed9d46eb438e2a6eda77d6b7ef364494.