Reverted back to yesterday's commit and added most things back in