Partially revert 0daa7ba

It introduced a regression for local data bag items