IN CASE OF PANIC, REVERT TO THIS

1.6.4 updates, DOES NOT COMPILE. Final commit before wireless energy
changes.