upstream modifications obviate the need for this hack