Small cleanup.

(cherry picked from commit 3f909978775fd3b3f1752497a6417381c372d2ff)