Backed out changeset 40f323c3c14e -- Style-editor completion broken