Cleaned up a backward merge after fixes issue #12044.