Reversion/followup to r59300 as per Tims comment