Rollback change of DNN-4311 because it will broken install process.