Add limitation for -rm-origin-after-ni (#435)