Yeah, after #1666 happened, we can move forward to using this thing in the player.