Revert "Stefan Monnier's Patch"

This reverts commit 8e95ab15132087ce163b3d8834a5d2b0d322140d.

Conflicts:

	ergoemacs-advices.el
	ergoemacs-theme-engine.el
	ergoemacs-unbind.el