Cleanup #9828 PR