Prospective legacy build system fix following r212620