re-add stuff thats not actually breaking anything