bug $(bz summary 927080);r=jgriffin