...in a way that might be a performance issue, so include the patch only
conditionally.

Change-Id: I483a77d0d199c2dee00139fdd4fa41223192289c