Revert "Attempt to smarten up indentation settings across buffer-switching"

This reverts commit 93bd6b9acc2af6050fc9fa4f65eec95bfd20e22c.