Oops.  Added some important stuff back in.