Remove code from wrong place.

Change-Id: Icce6767cee4ceb4f0bca73ad6932c791f889c6bf