Final fix to upstart; I think! :(