Revert 78a84b5..76eeb12

This rolls back to commit 78a84b56e14092cfc41890be9b8d7c43dbcd33b3.