Restore auto-framing (DEA). Imported from 1.4