This fixes what we intended to fix the last time, and what we broke

http://homepage.mac.com/kaicherry/downloads.html

-K