This reverts commit 650b7ad7.
Closes #3414208
Merged results pipeline #134829 passed
#134830
Merged results pipeline passed for baf047b0 Apr 1, 2024