Reapply r66415, which was reverted in r66426 for