Merge "Revert "Opt Compiler: Materialise constants that cannot be encoded""