Vendor my changes to ack-and-a-half until merged.