Revert 0c8904c..8f36ffa

This rolls back to commit 0c8904cc0874b650dc29b930d07f438b8dfb2e0b.