Fixing the 2.7.x build failure