an other temporary code that fixes both the compileonly and the xer issue...

an other temporary code that fixes both the compileonly and the xer issue (technically revoking the interested commit.)

Signed-off-by: Kristof Szabados <Kristof.Szabados@ericsson.com>