Revert "Disable per-filetype grouping of identifiers"

This reverts commit ce58773e02e3221fd79ade9e767272557cd6a0cb.