Experimental fix with setup script.

Change-Id: Ic52581d495e6da31cd2149e3305a67cec5e7b85b