Revert 2bba5f8..1bf8c81

This rolls back to commit 2bba5f86dd3cb747b400bdca705d6b79d8eda0f4.