Backed out changeset 6c53f6dbb7d0 (bug 1013809) for causing bug 1016498