Revert Me: Temp remove overlays that no longer apply

Change-Id: I05adbc8ed5de1a59f948749805e0ed40363ecae1