2.3.x one trivial revert and the BZ fix