Don't change the currently selected FH
The announced URL isn't the same as base_url

This fixes the fork test that was broken by 44babb5