#6012: revive jbrout properly