What's a good idea, the obviously wrong and arbitrary policy, or abolishing it entirely as God intended?

EDIT: Melenkurion abatha! You don't mean the freaking OP, do you? There is no god