Backed out changesets c7937fb5f4bb and cf8db9b6bd61 (bug 862986) for bustage.
CLOSED TREE
Bug 862182 - Revert bug 862183 due to frequent orange in 459439 crashtest. CLOSED TREE. r=philor