This reverts commit de095230d4c16ac36ec75caaebfe84ac7efd34e5. Did not fix the failing tests after 4fdcde5