Use my huxley fork until a similar fix is merged.