Revert 2cca229..0351177

This rolls back to commit 2cca229d87490c1eb451e0f24036123c5ceb63b1.