Remove same state guard, as this will prevent us from handling certain meta data updates