Another attempt at fixing the build on R15