Don't massively over grab memory [1]
Delete patch that might causing problems. [2]

Submitted by:   Gustau [2]
Obtained from:  OpenBSD [1]