Revert 23eb2f3..c912f41

This rolls back to commit 23eb2f3a23621c93639c425d19020a510f1f57d7.