Revert 68a9776..b4d7e5d

This rolls back to commit 68a9776616ab6a25f55a723de501c0bf56bd51b8.