Undebug / uncomment / unbreak
Test re-enable dock battery support.