The weak ref stuff is totally broken. Comment it out.

Change-Id: Ic19b9dfcbf92f623bfe31e8b38e66836cd9958f9