revert and correctly fix 4.2.2 compiler error