Revert "Revert "try to fix problem with fb's odd line_length""

This reverts commit 5c1236f4173df14cb9d3099c55762d57fb988805.

There's some thing wrong when mixing the two branches. Manually
reverting the previously reverted commit to fix.