And avoid hardcoding the version for all other versions as well, per suggestion in the PR. PR: 249888 Submitted by: Christian Ullrich