Revert changes to common/cvar/files. Possibly helps #7