This would be a good time to add an API comment while we're moving it.