Revert "HUGE Update for v3.5 (incomplete!)"

This reverts commit f56939e4ea0a52f2e8cca8b631330ad4e61ed9c7.