Revert "Switched to PCM"

This reverts commit 875d1d134e956d2daab6ae7208eed37a618f4d45.