Backed out changeset 0a76964b8d8d (bug 1048011) for causing regression