Fix build and sync changes with TC.No idea why this wasn't removed on merge.