restore xml suppressions until EL, etc would provide its own suppressor