Revert "Merge pull request #1 from maitkin-ltu/MDL-32888_master_latest"

This reverts commit a4724ccb377ca0b33869ce3774ee5ea28de7e84f, reversing
changes made to 56cc9b387ed095a18a6ee4df724dabf490f93df6.