gone back to an older version, seems to fix compiling issues

Change-Id: I804993535d8dd1f537faa54e133d297c3cd50ffb