cgates: Backed out functional tests breakage