Revert: Uses null default instead of undefined

Commit: 3b2c495464381a2288a72b21c36f6c4d5060dea6.

/cc @andrew :)