Per latest comments in bug #19069