Revert 3e89c98..f63d559

This rolls back to commit 3e89c986e628171f9b040da43580a77b52b06c10.