It'd be nice to get this upstream so we don't have to keep patching on releases!