Use upstream compholio patches instead of fds-team mirror