Straighten out sources after import of changes from 3.10