Added some things back in to try to merge on aegir.