Shouldn't this continue to be @Nullable?