Get 7.8.2 builds working again