temp patch for Bug 416293
3 files changed