phonon: revert some cosmetic fixes