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

This reverts commit 7ad4b859c346bc975feae3e147372b5c603f5bae, reversing
changes made to b50b0f06d0830a174e0ffb0b91429980a2e410fc.