Revert 0db38b6..9921498

This rolls back to commit 0db38b60537ba845ffe3fcbf825fbd2ec45f7853.