This reverts commit 259abfc7. Reverting this, as I missed a case where we return without setting RtCheck.Need.