[46355869] code refine for JD

rollback unnecessary code change

Signed-off-by: Henry Chen <hchen@vmware.com>