Revert 8016a40..8c243fe

This rolls back to commit 8016a4056c32e2d845cd2b97465a7004fe5baf59.