Applied patch for Bug 887179