Revert de6e272..455ec32

This rolls back to commit de6e272502b1eee5d4867aaad6664b24655ae1ef.