Fix up: add back required stuff

Change-Id: I639c6fc3e802963f110f0ea6f29d56dc30df5078