Backed out changeset 88e21b727815 (bug 903653)