Revert 9d255fb..a071297

This rolls back to commit 9d255fb33dfd181465a21a46e3c93c0a081ee753.