revert the change caused by Bug 911548