Submitted patch for bug 1058345 and filed bug 1058601