Backed out 2 changesets (bug 1884147) for causing build bustages on process_reader...