[R21.4] revert derived-mode-merge-syntax-tables patch