Right now, for an individual, the return proposal is the only viable option. Everything else likely require a HF. Voting the return proposal can be temporary for an individual, un-voting the return proposal is as simple as voting it. Takes a second.