[PATCH v3 2/3] add back original check