Starting fresh for 1.7.10