Bug 871916 - Remove Nexus S hack in gaia