Filed bug 1020415
Reviewed r/1723