This reduces extra allocs and simplifies the code, which was just there to workaround some broken pkgs anyway.