Backed out changeset ff17250bcb88 (bug 904720 and bug 915757) because of build bustage