Revert API changes of findlocale