This reverts and fixes commit 1ae28f66c6. Co-authored-by: lukebroskop <luke.roskop@hpe.com>
1ae28f66c6