companion commit to nodebb/nodebb@a061079, re: nodebb/nodebb#2082