* Revert r27114, it seems to break stuff.

Created by  Eelco Dolstra  on May 9, 2011
HJYRK37ANZKUPQY3RVUZNM7TU27R3OGB42WU7Y6K7Z5JFIT64TKAC
Change contents