Reapply part of r38587: