Add additional remapping of versioning. (reverse-merged from commit e68581a690c34da7dd24ae74b236c4360526a98a)