Changed set_active to be a flag
am: 9ef4d91267  -s ours

* commit '9ef4d912674e194b04c58c5c563ee76dfdae45de':
  Changed set_active to be a flag