May be its not the answer to your question, but aroused curiosity on my small brain.
If you didn't apply for OPT before, my two cents suggestion is to have OPT from STEM degree to be on safe side.