Revert a79c0b2..92d0f83

This rolls back to commit a79c0b26420fec9929b9ba2d6cc3109aefae9ec6.