Final touches to the uptime branch, revert