Revert "Maybe a fix for achievements etc.."

This reverts commit 6a4cdfaee579497afe766f574d42c886689f4bd3.