Revert b1c31aa..99c789d

This rolls back to commit b1c31aa38687c7ba0017d1fd6247afa6ed69d31a.