Partially revert 1e8dbd46

Merged Robert Speicher requested to merge rs-revert-11842 into master