This reverts commit 597230a5. Reason for revert: Breaking all branches Change-Id: I6765da463a20d9ff56dd5b0be99cbddaee417866