Fix for BZ 1168792.