BZ-1168974 - Side effect errors due to commits from BZ 1042508