Fix #1934 (make Reset and Restore options more distinct)