Display fails to return after monitor turns off

Upgrading to the 580 driver (nvidia-dkms, nvidia-settings, nvidia-utils) appears to have fixed this issue for me.