Attempting to re-add the broken layers identified so far.