Revert "Fast Charge changes"

This reverts commit 179579ba63535d8c5d11439db6063d8c187c69b3.