Temp switch to the baseline player. Reimplemented.