Revert 60cc72a..762981c

This rolls back to commit 60cc72a083a2b7a6dbb8c1a1264ab28bbfbd0b16.