reverting patch for bug 209562, for now
1 file changed