Core/Player: Revert partly last commit