Revert 37db509..45238e9

This rolls back to commit 37db5093f662006f8ecdaafba525453f4950107f.