You want to revert the commit 5da31c8817293ff98b4defceb962f7d0fbc25829.
Quintana said that it's a suggestion for it.
Some Portuguese last names sorted under first instead of second element! See blob e69040d889c1748d538f1198f6c85b97f55418b5.
Araujo Chaves, Pedro, Jr Arcoverde da Rocha, Augusto Castro Lopo, Erik de
Example of Portuguese last names sorted by the second element:
Chaves, Pedro Araujo, Jr Lopo, Erik de Castro Rocha, Augusto Arcoverde da