The default values can be restored with:
sudo fw_setenv hdmimode 1080p60hz
sudo fw_setenv outputmode 1080p60hz
This is less aggressive: it assumes 1080p60hz unless EDID says otherwise.
Make sure you always set hdmimode and outputmode to a sane value, or you can prevent your device from booting.
Sam