Merge "Fix botched refactoring"