Revert commit which caused crashing of the game