Revert 7dbec5e..f02e396

This rolls back to commit 7dbec5ec096a3970fd4e9e331fbe08b10ff70786.