Revert "3.4.38 patch" since it made it no happy.

This reverts commit 7478400e35b7c81842a422bccd48b38ddcd15721.

Conflicts:
	Makefile
	to fix.txt