Revert "Merge branch 'fix-installation-of-rpms' into 'pre-o3-release'"

This reverts merge request !471 (merged)

The change should have been cherry-picked to the branch instead as this brought in other changes on master that should not be on the release branch.