Revert "Merge pull request #16455 from JonHylands/jhylands-947617-clock-power-usage"

This reverts commit 7e1c255c20b64d09ef0e021b8b9d7377840d4061, reversing
changes made to fdc8e4beba5c8279f32083bc4e702348ef22f211.