back out a few srcpath changes