final commit before I rip out the code from NYSCI - if you must revert
to NYSCI build, this is the fail safe.