Remove old opt-out code

Follow up: Id86375a7e9a7aba1ec3db2a37d61c76413a88b63

Change-Id: I112e69ed66a43d32d52ca31803e57e1566236e15
Merge "Remove old opt-out code"