Backed out changeset 332504a9d638 (bug 980506) for devtools bustage