re-did code changes that may have gotten clobbered?
Merge branch 'workspace-per-session'
Somehow, binding doubled. Fixed.