Undoing DSL refactoring that broke ActiveDoc.