Upgrade back to 5.4