Merge "MethodHandles: Remove obsolete test workaround."