blocking 73143 (revert of 9508 bug fix for 1.4) -- don't want it backed out of trunk...