Comment 10 for bug 669481

Submitted merge propsosals that parameterize this behavor.