Revert "Revert "Try again to simplify twitter""

This reverts commit b7d3b121058ee70b320e995cb47966ae0ec49959.