Backout: bring back all the scenes Without this, editor bootstrap workflow dies. Tests: none, trivial change