Revert 7e56782..94af103

This rolls back to commit 7e56782d2e83d7b7fd51ea4f10b24295e136c7f4.