Plain Diff
Revert "Merge branch 'cherry-pick-3031ef5e' into '1.2-fixes'" See merge request fusiondirectory/fd!214