Revert ping pong change