Spring break! Build-breaking commit!

I have to leave now, so this will probably break the build.  I will fix
ASAP.