Hygiene: Address toggle fix me

Introduced in Ia56cb0f4492ccf599be191123287e93c50415ced on
Fri Oct 4 so this can safely be removed.

Change-Id: I1ed06c9b60822769659944e44f65277d4e86c485
Merge "Hygiene: Address toggle fix me"