This is #4704.