Attempt to fix test failure after 236915