Merge "Revert "Remove ping.""