Experimental fix.

Change-Id: I9e56037cea5d7bc7e34225250e443d1358504bee