Hi John...

have you tried "Boot Repair" yet....it seems to fix most things I screw up....including GRUB2

haven't seen the problem as I have not updated F25 in a few weeks...I
use Arch Linux 99% of the time...