This can go away with 0.9.0, can't it?