bug 1137: Revert patch from Ted, because of inconsistencies. Also fix a typo in the...