Code recently integrated (#27353) has an erroneous (meaningless) assert. Closer examination of intended behavior reveals that the fix involves replacing the assert with a new run-time check and conditional return statement.