Backed out Paul Green's IRIX patch since it didn't seem to be a part of