This change was present in the patch for 520500 but not 521863.
Applied separately after discussion with Chris Pearce.