the failing tests appear to also be causing trouble upstream (cherry picked from commit fb570ba1de)
fb570ba1de