TEMP: overlay: Compensate for incomplete featureset

Change-Id: I0c5d8985e73ebdb08fa4c0db13c8c8e431d7ee1e