partial revert of 3e914f03 (bug 938320)