Revert "Merge branch 'revert-a26d5e6b' into 'develop'"