Revert de00acc..967fc47

This rolls back to commit de00acc8318d3009ec105ea64518c63d25cc1511.