Re #10123. Temporarily revert changes that break tests.