This reverts commit e2b4c876. Reason for revert: git_master broken Change-Id: I88e613fec4bdb3a5423770edc3f298867b44cd94