Update from PC.

I'm not sure why there are uncommitted changes on my PC; I think it's
just b/c I deleted an unneeded file.  Hopefully this doesn't blow up
anything.