Update to 2.8.5. Based on the work from Rafael AKA sizeofvoid Sadowski.