Backed out changeset bf39866cc3a5 (bug 1047469) on a CLOSED TREE
Bug 1062632 - Follow-up to fix build bustage on a CLOSED TREE