TEMPORARY: overlay: Compensate for incomplete featureset

Change-Id: Ie584843a039c37018e8908e78074fcc1153a6fb1