Revert 69ec384..2355a29

This rolls back to commit 69ec3848bdf6322e1904b5a4a765bf653ce821d8.