Revert "Merge branch 'master' of https://github.com/psi-plus/psimedia"

This reverts commit 9a9f530082d60fd252933328ace6ac6335c46461, reversing
changes made to fb54b6e91226147539f56ebea24a7ba76ac54c67.