Revert to EXTRA_OPTS