Attempting a fix the build bots should be happier with. Amends 198804.