Revert "Merge gson1703:master fork"

Reverts paragonRobotics/ec2-new#7