Revert to 03fe36c2
revised & tested; passed mote experiment