Follow our own performance control

Change-Id: I9b37fc20970c59dbc5cadd917192dcf9cee4eefe