Closes #3210684
Revert "Issue #3174107 by brianperry, mglaman, mtift, alexpott, mradcliffe, ravi.shankar, capysara, cathwaldron, kostyashupenko, mherchel: Add additional testing coverage for Olivero" This reverts commit e182007f.