Suggest we keep as-is but add a separate issue for this?