Forgot to grab the latest changes, so I'm re-deleting the stuff Jon
deleted.