Shell/3907

[endlessm/eos-shell#3907]
Ditto on taking this out with https://github.com/endlessm/eos-shell/issues/3908.