Add back the removed components. Awkward....