Re #9415. Remove code added just for testing.
Merge remote-tracking branch 'origin/bugfix/9415_remove_testing_code'