Merge "Fix build, missed refactoring."