Revert 1dd00de..6aa28d9

This rolls back to commit 1dd00de8bbb214292aa2c25c05002748cbe70d6c.