Probably we need a TODO for this somewhere if we don't have one already.