Fix for BZ-1069788.