Revert "Merge branch 'master' into ElectricalAge"

This reverts commit d5f12e23b42d1ea82421f7da5c8f59ca4557527c, reversing
changes made to 6a134884e488ac053f4e9cd48ea4fb1f1ce29a8c.