Revert 17d623a..f035e6f

This rolls back to commit 17d623abb0741ee96253209b4cd1a965953122fd.