Removing versionadded 2.1 that leaked in from a merge up