At this point we don't want to make API visibility changes, so I'd remove this and the following change.