This reverts commit 55ff9de8aed998468caf320a3b7ecb7407e721e1. Change-Id: I37213ea9bbd43a83835a9de6f873ccd1b549ad17