Reverted fix for bug#10402 due to problems in certain cases.