Merged [21312]: This was fixed in [18711] but was accidentally reverted at some point...