fix 3.10/mainline builds