Revert 8feed68..18201dd

This rolls back to commit 8feed68f48b4bc19c28709d9a3ffa3dea5878a6b.