Reverted an earlier change, as it was breaking audio loading on the Nexus 10.