Follow up on regressions introduced by initial fix for redmine 6553