Revert 16f83f0..1c7fe34

This rolls back to commit 16f83f048921f8fcff11180a7417b69f736be50f.