Missed during intial migration refactoring
Fix badly merged code.