Revert "lad1337 xem merge"

This reverts commit 854f7fb0ea27cf665a8f89d4e98390b5637b76ce, reversing
changes made to e6dcfb307ba4ac3dc6388e9b0278497359109f40.

Undo last commit mistake