Diffed against branch `remove-compatibility-code':