applied changes from 8b6590428d8180cc466c8916f81aec2c8961fbd1 through 1f5f812e500972cfb805d2cf0b3bc423cf2b7f3f This hack to manually handle X-GOOGLE-TOKEN an X-FACEBOOK-PLATFORM shouldn't be needed now; avoiding them was masking the problem, since we should be prepared for a server to offer any number of arbitrary mechs which we may or may not be able to handle.