Emacs updates
Emacs updates
Revert "Emacs updates"

This reverts commit e281a05c5229f647a1fbbb59798b81b5ff045739.