Backed out changesets 45840c6628d7 and acadb164dbc5 (bug 941805) for causing bug 966782.