TEMPORARY: overlay: Compensate for incomplete featureset

Change-Id: I6b362e4e78c6a3c9363b027e1f90cdf0ef92c333