bug 1004833 - revert unrelated changes