This reverts commit 61c63737af. Fixes JumpAcademy maps failing to build.
61c63737af
Also changed some of the source derivation names to keep our sanity