Backed out changeset 810977d38c0d (bug 701479) for jetpack orange, DONTBUILD because strict backout and RyanVM says so.