Fix for BZ918130.