Fix for BZ-1032722.