Revert changes for NXCM-5131

This reverts commits 683c647d65c7979cc5f5b3c4c0056d93f235fef3 and
d4f21a034d20501c109210fe15614dbe5a0d3560.