#1244159 Additional work on this bug, back out some changes so that fact labels print.
Merge remote-tracking branch 'upstream/master'