Based on revert of commit 78ea83d753. Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
78ea83d753