Bug 1016813 - [FTU] Update to use gaia-header

what do we need this for, and if so, why is it commented?