Remove 3.4 fixups.