Also move the line that the comment refers to back next to the comment. Change-Id: I0fe3da30ffc5578a01ab79eb45389e8dc08108ca