Revert "Revert "[split] fixing twitter-server upgrade""

This reverts commit a328dc1d1e5e17f8ee86dd11db4c4990f48d11c2.