Revert 88c473b..0c3827b

This rolls back to commit 88c473bbeceea33b9f97087c473f74a1424e17d7.