Revert [47fe99a14b] as it broke part of mythmusic, may retry this at a later date. This keeps the header changes to the gallery code as those were still necessary.