Backout bug 860318 for various breakage