Simply previous commit b3480b9f, also fix joshfire/jsonform#93