Follow-up to #15184: Fixed CGL