After tagging v10.8.3, this can be restored to how it was and corrected
as required in a separate PR.
This reverts commit 494ed7e4d2af34db10db3af90ec5d045017066c4.
This PR was causing breakage in installs - ref #8198
This reverts commit 7323ccfc232d31797af3ceb8bad93cae1ea0898d, reversing
changes made to 77a007a24d5eef1209766d31e2f5038b11d1a8d4.