Backed out changesets a99be5669498 (bug 831489) and 140221368247 (bug 821208) for frequent Linux64 debug b-c failures on a CLOSED TREE.