Revert "Routine sync with main carbonite"

Reverts Raka-loah/Carbonite#4, not working, waiting for next version.