Revert #3013, Metasm update

This reverts commit ee0aa20955d7e7c0e1b19f2217dee10da29d0306, reversing
changes made to 3c2eb29762cc9c5c4376207e978e24b227393ea9.

[SeeRM #8775]