Revert 8c4cb03..3fb5946

This rolls back to commit 8c4cb03616de1ce244d1eae2783c7e5a7478f0bd.