Should we add a comment on this to say that we may remove this access in the future?