Revert "Merge branch 'feature/ST-XXX_flaver_branch' into feature/refresh"

This reverts commit 2d2afd94beb7d01d6f7b206ded5229a224a38c4f, reversing
changes made to 879d7e583b0ae0a8e53784fcdc53d235769fe8c4.