Bugs 1084980 and 889947