Fix Site() properly

If767d6fd5367d0e52ccacf7f2229112ed1c0933d caused a build breakage.
I5eb9d2b39768b047290ac8c14e0201114630daed was an interim fix.

This changeset reverts the interim fix, as that is a preformance
regression, and fixes the initial problem by not looking in a dict
for a key unnecessarily.

Bug: 68560
Change-Id: I10ad12bc70088bf0924ba0664c3fc01db45785da