Remove workaround for fixed upstream wildcard bug

Bug was fixed in 0.90.7 which we now rely on.

Bug: 54641

Change-Id: I057473fb7a7169696cc196a07466ac039885e544