Undo accidental local patch inclusion

Undo the accidental inclusion of a patch that overrides the expected
zlib version that was commited along other changes in 86b265e9.
Add some missing allocation information to the trace_summary

(huh, I thought I added them already?)