Is there an upstream commit for this?