* revert incomplete trunk-compatibility-patch