Don't use the last server fake, but the one we want

This makes it *really* frustrating adding a new server fake.

Change-Id: I968d32ce27b34ee8dc7a6ff821de21fcee832741
Merge "Don't use the last server fake, but the one we want"