Revert "Merge branch 'cherry-pick-5e437277' into 'master'"

This reverts merge request !180 (merged)

Necessary in order to tag DaVinci since the related MR to the Phys package on which the stack relates came in AFTER Phys was tagged.