Revert "Merge branch 'revert-1ac0969c' into 'develop'"