Remove awful hack for system assemblies