Testing: make S4 actually compile

Change-Id: Iffdc84cea0db879725c13298f49af567a834acbc