This reverts the workaround for opt_trace.h issues in CURRENT, since these have been resolved in base.