Issue #1892948 by benjifisher: Fix options are reset when reloading a file. This is a partial revert of 95d5f69 and 955dba8.