Fix `ci-status` broken by changes ported from stable branch

Broken by 06999d9