Adapt to work with CS
...eventhough old and terrible
[4.3.x]
ERM33423
Change-Id: Ic877f0d27c42ed378b1fdeb09052db93bc901b33