Revert "Merge branch 'qwcream3'"

This reverts commit 9220c8439754df678b24268c789e1ce03f4c273b, reversing
changes made to 08bdfd996a900bc56ce821f0e7ab6a620d4658f7.

Conflicts:
	config_manager.c