Are we there, yeti?

By @dr-j fixes #10972