Rollback Justin's changes to support nullable types