LPS-44739 Revert code that uses offending method

Pushed to upstream to solve CI server test errors. After talking with @juliocamarero and @robertoDiaz, we found that this code affected Staged Model related tests. And, as this code was added a week ago, there is code that uses it that has been also partially reverted (see last commit). Both @KocsisDaniel and @matethurzo knows about this