Patch the omission from prvious commit #17716.