traffic custom revert and fix

Change-Id: I9b5efc1b664edc3fb0fc8dbbd7bc0baec6cc6017