ed8458f67a
This reverts commit bb01aca86f66954b80798213711e8eadc4b26902. Partial: Keep regression tests
This reverts commit bb01aca86f66954b80798213711e8eadc4b26902. Partial: Keep regression tests