Fix migration to commons-lang3