Nothing to see here, continue with your planned spooking, citizens.
Merge pull request #5573 from Miauw62/ifuckedeverythingupagain

Fixes spookoween.