On bug 5474, we started using the THINLINC_UPSTREAM conditional in TigerVNC. We should use this approach for our other upstream / vendor drop projects as well.
We should also document how this is done before closing this bug.
We've tried this for some time now and it hasn't been a clear improvement. As such we'll abandon this approach and make a different attempt.