Revert "Fix the sound engine, it is a quick, dirty fix though. TODO!"

This reverts commit 993f54c80753f7f64fd62e7bcead294f27c9f19e.