Not sure if we really want this change in vanilla openGOAL, but I had it working on a branch so figured I'd PR it.