Remove hard dependancy on stdlib 3

Sending patch upstream which we've been using for a while