Fork upstream to support the customization we want