This reverts commit 238bc1de8082a20b11bd60a231cf03f34f1a4c60. Change-Id: If9041b33bb95582406518f73b601671fae11e984 Signed-off-by: Seth Howell <seth.howell@intel.com> Reviewed-on: https://review.gerrithub.io/419731 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>