Can we leave this with a TODO for 0.6.0?