Follows a4c698ac48. Fixes: #6046 Differential revision: D3587 Reviewed by: @wraitii This was SVN commit r25100.
a4c698ac48