Revert "TEMPORARY: Compensate for old blobs and incomplete featureset"

This reverts commit 43170ac5f91d713780bd0389fdce8d5dfe9b05a8.

Change-Id: Iccdb988feb4db1b0108a11678882fcd12304e319