Revert 85786db..98d00b5

This rolls back to commit 85786db3f49b0d828f57909266c063cb04c107c0.