Yuck. :-(

We need a bug to clean this up generally...