Whoops, that broke the HEAD build.  Let's fix that.