Revert "Merge branch 'feature/issue-1668' into develop"

This reverts commit 840a19b1a39cbfe69dc3319f1a8c1b1534bf16e7, reversing
changes made to 324cff8ed44a035871bbf6888891b956aa3f3c1a.