This fixes #11185.