3.4.0 revert