Somewhat more elaborate approach, but that actually works.
Merge branch 'addjartoshell' into bizo