Backout changeset 2766d0ee65c5 (bug 903802) to fix bug 906378.