Revert "patch-3.4.1 & patch-3.4.2"

This reverts commit a333042f510bea2b86aaee925b9cc8dd0030e54d.