Revert a5118e4..280d4f3

This rolls back to commit a5118e4d347aa3e323ef5fdfe0fd5323e3d80563.