Revert "Bring SolarCrane fork up to date with upstream."

This reverts commit b63f6bd26393e20e6938deceed5a4c1ca0697a3d.