up to svn r1661, fixes LP#1290146