Revert "Merge branch 'revert-4fabf83a' into 'develop'"