Should we create another issue to make this non-public?