Revert dd1eec2..aef9d18

This rolls back to commit dd1eec25f251f413e7fabf6f9437e87b76453efc.