Pillar fix in raet

Applies #14027 to RAET.

cc: @pass_by_value