Backed out changeset 489046125fa6 (bug 897683) due to Ubuntu debug Jetpack perma-orange.