Rollback of removal of @NotNull annotation