Backing out a number of changes that broke the structure