remove 3.4 cherry pick