I think this optimization should have stayed in, no?