Revert 3ccbe7d..b752ea9

This rolls back to commit 3ccbe7d68f33aebd3acd1001acb63d2340699b8d.