Magic-HD] Partialy reverted previous commit.