This is needed after bbd16236e986ef1b0e1da37c9c8a7f9dd2d63b5d (and 99feb137f5f66f903bba816c1d98ced2a92bef12).