Revert 73aab09..64cacd8

This rolls back to commit 73aab0984ed907a0c2a35b4b2ca734b156f7f410.