Revert "Samsung adv strikes back"

This reverts commit cdf05a58a54aa82db163038a0e496f39c9959251.