Backed out changeset d53b25dcf2d7 (bug 966168) for causing bustage