This fixes #7612.