Bugs 1017675 and 1017596