After much gnashing of teeth, I finally got my workstation working again.  A day and a half of work, so I can get back to work.