Back out b4c82e9838d5 (bug 939464) for make check assertions
CLOSED TREE