Fixed the code to reflect the changes in D13134
Please ignore. See D13089.
Closed since the changes have been pushed to D13089.