Don't break API/ABI since the breaking change won't make it into 5.0