[529472] Revert to buildId-based buildQualifiers
7 files changed