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