(cherry picked from commit c553ca54d5de4c9ce9ebdf1c416985a56f20a9a7) And fixup previous bogus cherry-pick that included merge conflicts.