Merged upstream changes.
removing patches to try to do build comparison thing