This reverts commit bd34590a. Reason for revert: Choosing a different strategy for multiple releases. Change-Id: Ie05f557e07c68289d6250fc6d65947e90603978c