Revert 4018d2a..8eca8d6

This rolls back to commit 4018d2ace9f61a0a91a3612f395f7cb225a190ee.