Revert "Source: Brought in as much 3.5 source as possible"

This reverts commit dbb744f5bfb13b2f492d9937847d06d2a0ae55c2.