Revert ec32d21..f1019b5

This rolls back to commit ec32d214a3e3eb4102ab3a45bbd281095152dcf8.