Enhanced upower patch.