Regression: make editor work in beta and alpha

Regression from 3a7bd29a.

Change-Id: I150235219916b02ed6b917d40330da8982332b0b