Created by: ens-ap5
As discussed with Tiago, this is a blocker for release 96 - reverting to old version that used eval.