Backed out changeset bcf74bd6c78f (bug 959719) for JB bustage.