Filed bug 1111264 and submitted r/1455