Backed out changeset 23e7a68fb491 (bug 969378) for bustage.