Backed out changeset 0cdacae4e612 (bug 786631) for bustage.