Revert all of those tweaks because something in them broke LPA playback on S4

Change-Id: Ib1f601620e7d66310c6389f5f3055ed58bea8b0b