Revert "[TW158] - More hacks around Shadowmeld"

This reverts commit 1853a8c3c896338fa7477e97f1cd5656b702fb82.