This reverts commit 09ddb3a7. Reason for revert: breaks branches without vendor Change-Id: I2de95d7b99e4e5fd3d696f51d5b4d6a68a298365