Fixing bug 1251 that affects some backports only