Merge back earlier powercap material for v4.8.