Revert "Squashed intelli_plug v3.8 update"

This reverts commit 4293ff9d093476c145b2e4b9eb588db40c2864c7.