Filed bugs 1000853 and 1000854