Backout df75a87cce60 & 19e164f7d88d (bug 818670) for build bustage on a CLOSED TREE