Revert a65cf25..5c1b968

This rolls back to commit a65cf25a2b99d1c74cee234395c98ccac1936aff.