Pushed to allow working from Stanford.  Not fixed yet