Find another (final?) workaround for bug #65136.