cgates: Backed out functional test breakage (deux)