Emi - revert UATNBNXR034 - 1st Revert

Bugs cancel