ulimit: revert to upstream v0.3.1 w/ our prev. changes, and 1 new change