This reverts commit 9c44a95d5168c219facb39e7cca275d1e0a02cee. Change-Id: If328d3101ce44c63d643217218109bb82e4f20ae