Gotta fix stuff.

Revert "3.4.28 patch"

This reverts commit 52b3f7512c926aeeeef48c7e45608f7188b7f5a7.

Conflicts:
	Makefile
	to fix.txt