Fixes #5494: make rudder compile and tests pass again