Maybe we can remove this versionadded tag