Revert changes for DNN-2949