Backed out changeset b2e1c92b7e39 (bug 899495) for build failures on a CLOSED TREE
Automatic merge