Crashes on YouTube, need to investigate This reverts commit 1749e2cf. Change-Id: If5f133d55dcc26b8db79a670a48fbd4af7807556