Comment out first patch and see if we are ok.