Merge "toolbox-ls: re-introduce clobbered error message"