antoniop
committed
on 27 Jun 18
Remove hotfix and use new user api