Remove overlay breaking build

Change-Id: I9399e6da30238829c8ad24ffb5131bd72167e4c4