Reverted a few extconf changes