Actually backport things... derp.
Some more work...