Revert FW short and spon hls changes on prod

...in attempt to resolve non-playing ads issue for all dev build