Revert back to original implementation when assigning `null`