Revert "Update to be compliant with Weasis 2"

This reverts commit 17de4146998aeb7e2e259eb0bfbef990d9343d0a.