Revert 79c33ef..b76ae5f

This rolls back to commit 79c33ef352ef578173a3c35e186f86e6d3c0f79d.