This reverts commit ba8e075ed4. It is no longer necessary. Change-Id: I5d9656ffb686e939f006d5fb1effaba835f93ed2
ba8e075ed4