Bug 861180 - Remove power shim r=vingtetun