Revert "Fix assert_null and assert_not_nill"

This reverts commit 7cffb39a9e40ce934ab16518b7aca228488e5e2a.