Reverting r35060 -- can't reproduce the reported problem so far, but if it exists...