Revert "fb: bring back reserved field usage"

This reverts commit cd0a1ab2e02e128b39ea99c319bc423bcc8488b5.

Conflicts:

	common.mk

Change-Id: Id719dc9c78c47c5c00dad2ef6153b56bd4c8f6f3