undo dup backport in tests against rbx-2.x to get tests to run.