Fixed up my bad merge from gda-8.32