Revert "mdnie: (negative effect) revert + fix build error"

This reverts commit 546599ae571cd27dffda8b7abacddf2d014210b9.
Revert "mdnie: (negative effect) fix build error"

This reverts commit a6a678bf72e9044d29d32089363d6a5c0e65d36c.
mdnie: (negative effect) fix build error