Backed out changeset 5bc40c94645c (bug 880752) for jetpack bustage