The handling of OPTIONS requests was consolidated in #7534, but the endpoint specific handlers were not removed.