Re #9415. Remove code added just for testing.