Reverted fix for bug#7110 due to QA fail.