Revert "More thoroughly disable electric-indent"

This reverts commit 99658ce11e08b8f0825a17247bc84336b6a4cd8c.