reverting patch for bug 209562, for now
2 files changed