Also, @GaelVaroquaux it appears you've not reviewed this part of the PR