Restore support for plain not_found return value