TEMP: overlay: Compensate for incomplete featureset

Change-Id: Ib01df17668521484c1153aa16cb1339b5bdea9de