Unbreak all layout cleanup changes attempted