undo dup backport in tests against rbx-2.x so they run.