Backed out changeset f4e24f923395 (bug 1092132) for Gip bustage.

--HG--
extra : rebase_source : 6a09b24d719c71df8556aa1ce692d9af7570a08a