Another attempt at fixing mysql build failures