only copy from 40_05+

All the raw changes are technically compatible, but cause some serious
problems with graphics packs