Merge #11951: Remove dead feeest-file read code for old versions