Revert changes to voice and speaker paths

Effectively reverts aa4a449ccb10e6ca533c886f35207d49f80a036a

Change-Id: I2fed184915cfad5410991766421a1932bc48451e