Addition to fix for BZ-1069117 and BZ-1067591
(cherry-picked from 9b2d849)