Revert a few changes

Change-Id: I156e39213b2d5eb0268cdcfd74080ed07fdad317