Revert "Fixes crashes at startup with Yoshi's Island - hopefully shouldn't"

This reverts commit f48ce593cb03c373c807ea1e91ade3ebc3aa27b2.