Bug 7207 - Reverting a portion of commit 607b5449bd5cb which breaks the label export...