More cleanup of adding things back that were already in place once before.