Revert d25b684..b37e6b4

This rolls back to commit d25b684422c41a353fc92a26757790bafd7dd2d0.