Add some stuff back that was needed