Move back in the old editor classes in preparation for re-integrating them with the new object model.