Cleanup from issue #15831