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