Log Message: Backed out the last change, since Joerg told me that Adam will provide a better fix soon.