Patches in the short term compatibility with <0.11.10

This is a slight rollback of the last rollback, but 0.10.18 fails with HEAD of node-addon-layer. This reverts the relevant parts for 0.10 in the short term until there's time to fix it (or I suppose drop 0.10 support).