Comment From: snicoll

More coffee required.

Duplicate of #21410