cherry-pick patch to fix MEMLIMIT (broken in previous blanket update)
Source for buildrump.sh git rev 74fa5257163c8a567147c9216eda01ddac84dce0