Follow-up for c1f27be82ece794511ece73da251d77550f6a468