Revert da2f762..869f76b

This rolls back to commit da2f7621f08f8a37092cfc29988ddbb5da92ca28.