Back out cb34d80e6fc8 (bug 889515) for 10.6 assertions
CLOSED TREE