Backed out changeset 9f852d187722 (bug 883789)