This reverts commit a738111e. Reason for revert: mistakenly used "RESTRICT AUTOMERGE" on the title. Change-Id: I7ec9917887763912114405ba89eb5f0fac328d97