Do we defer this TODO to #499? (or is this completely unrelated?)