Rollback changes for DNN-21973.