playlist handling: revert part of r30177.