Revert "Merge branch 'feature/9371_Refl_MVP_Base_Setup' into develop"

This reverts commit 0e7fe203fe21322645417d1f304c43dacc7346a2, reversing
changes made to 2dcac9d1e730ddbcae20d54b3059d119cbde6f65.