Revert "Doh"

This reverts commit f1f938512d4e3c478ea3c09db0536912657fb8ae.

Created by  Eelco Dolstra  on July 1, 2013
H7RT7EM6SYL4MQAGXZE7UPTOHCP4U6NERN5WIHBZWGY5YUP3DMTQC
Change contents