Back to using autopair.