Reverted some of the cleanups in GEC15 experiment