Put back all the changes post-Doug's mistake