SIO-1247 Fix not being able to rejudge when can't change kind

Change-Id: Ia87af3cdda12542551e4d6d5348182757b1e7981
Merge "SIO-1247 Fix not being able to rejudge when can't change kind"