This fixes #7738.