Revert 22bcbf3..4e75db4

This rolls back to commit 22bcbf35f2eb1ddc5f81897a10703a8ccfeecc4b.