Revert d656135..81f904a

This rolls back to commit d656135aec7b181772083bd2ca3208345c98ba57.