Completely rebuild from official version again

This hopefully fixes the issues spawning objects