Merge in #495 with node-libs subtree.

Removing human error since I keep doing this wrong.