Backed out changeset 2d80e7cf6e09 (bug 901239) for Jetpack bustage.