Removed my temporary fix for pairing server bits.