Fix incorrect removal of double underscores from 78f3069d176d4f06bd8b005ecee458f0aa295932, but in a better way
Fix incorrect removal of double underscores from 78f3069d176d4f06bd8b005ecee458f0aa295932, but in a better way

jobovy/galpy,jobovy/galpy,jobovy/galpy,jobovy/galpy