Another unfortunate hacky hack for stuck commits