Let's not forget to move the comment too.

Change-Id: I86f2107860cf7e014277abdc14307c444142fea6
(cherry picked from commit 93b809d4c4151a02404308a20ecb20f1d6378e0a)