Bug 4133 Amend kohastructure to reflect earlier patch