Revert a053d8f..7def7a6

This rolls back to commit a053d8ffdd3c4b10cf79673d95cd5c241e16c7f0.