Revert "Last try!" ...if I want sound and don't want white lines.

This reverts commit 2ee41a1654b6483a757465416cef3f590258ee42.

Change-Id: I8c4a9f91454c0d2426fb79146d05cc7766218d45