partially re-apply 6ee9c2e0, some features (like wishbone records) got lost during the merge in 69883c7c