Reverse Marco's patch, pending a proper review of my last patch from an English speaking Mac developer.