[BUGFIX] Follow-up clean up to #24389