- revert compat files hacks dropped in ed1b146