This reverts commit aa2be45a560b37c5249600667ee36a9f156515c2. Change-Id: I5cc76b15b311e47bc5a892704930d218c9f72b0d