Back out the edit_flags portion of r1033.
Back out the edit_flags portion of r1033.

TBR=maruel@chromium.org
Review: https://codereview.appspot.com/8835045/

nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra