[Fix] Broken build after r215121