Revert "Bugfixes for centos and mac os"

This reverts commit df6195f690f005951e02b853475936156e22aa3b.

Conflicts:
	build.py