Revert opt_* changes