This reverts commit f62eee7c510238bf93b6ad43acd8b8a79a44417c.
Verified that a hardening patch landed after this already negates what this patch was a stopgap for, so we no longer need it at all.
This creates a number of stubs and leaves some surrounding code that may be irrelevant (eg. recorded time stamps, status variables).
Stub resolution/removal should be a follow-up to this.