Cleanup from issue #15831

Ping @ror6ax