Revert 425f1e0..e353965

This rolls back to commit 425f1e02943df0d081e2fe03fb263f0c4002fade.