This seems to break facebook This reverts commit 05266432. Change-Id: I6c8dabdc2519c0925ffde41975878f821e3933de