Reapply r270597.