Fix build failure from reorganization.