noticed on powerpc64 but these fixes also apply to powerpc proper so remove the workaround from Makefile too.