NVTY-27 Revert original commit
NVTY-27 Proper fix