quality-19 Revert last refactoring changes
https://github.com/regidev/mte/issues/issue/19