Backed out changeset d610b0d353d4 (bug 995757) for bustage.
CLOSED TREE