Revert "Updated code for our mote stuff."

This reverts commit c0b280d7d49b086759373d5aaef4c9b933213994.