Backed out changesets df5a68af3d30 and 6acacaa75fad (bug 995295) for bustage.
CLOSED TREE