Fixing a back merge issue in 2.7.x