NXP-13555: remove dav workaround for deploy