This appears to have injected some voom into things. Not benchmarked
though and needs double checking for memory leaks.
touch #360
Former-commit-id: 0707a36781e3a5fa4d273d933d1bd1b04b022092
Former-commit-id: f7ec165c3d10d9e1e35b8eec3545ca75cf302cf9
Former-commit-id: d5bc57ce1cde9f1486a954d3453040514dc4d629