Fix all our own issues.

Waiting for Android's official fix for their broken NAT implementation.