Revert c2af9e6..c84f486

This rolls back to commit c2af9e686a0dbdb3a91f0a75f2cc0937267dcae2.