This reverts commit daf3b57e89, reversing changes made to 7a6e0b7d77.
daf3b57e89
7a6e0b7d77
Sound still doesn't work, however.