bz916799

This is the revised fix which will not break any tests.