Partial revert of "Use Sub::Name to rename copied subs"

This reverts commit a9138cf7a5296d50a06a8d762bbb1fc4dd32913f.

Left the test in as a TODO test for now, and left the $VERSION hack in too.

Conflicts:
	Changes
Bump version