Removed other changes made to facilitate tmux.