bug 935576 - revert 11198ff7b73c