hopefully fix 5.8.x and 5.10.x build issues