I'm probably just going to fork in order to consume the patch I posted there