This fixes #7481.