raptor-optimizer-require back to normal (tests passing)