This reverts commit 1903d1adae. This didn't actually solve the problem. Change-Id: Ic789e96dcc17268abe3690647e1d82a764491646
1903d1adae