DB/Gameobject: Revert hack in cabfcb1a3df7faf1425e5fecc1cc5100eec5ffb0