Revert "Conditionally revert Adaptive playback commits"

This reverts commit f23b2aafdaec960762ae77bc01c325c34267d572.