Avoid cargo cult rites

Change-Id: I39fee26048d5b4ddb03217309b7117bef9ec4cd8