flac: remove extraneous steps

Some of this was from duplicated cherry-picking.