Update the code according to the changes in r209468.