Revert f36def5..9f8b370

This rolls back to commit f36def5bfb9007d56ef95618253d0799f4c783a6.