Revert 7a8348e..440de51

This rolls back to commit 7a8348ecf937993bfe2d9c93645390c725a75f2e.