[BUGFIX] Follow-up clean-up to #19938