companion commit to nodebb/nodebb#b80b0e1