Revert 3d17d0a..7af2542

This rolls back to commit 3d17d0ab6c1ff54ab7d320a7f5c35916aa314ad5.