Back out 7f12ca5e6d0a (bug 750303) on suspicion of breaking l10n builds
Merge m-c to inbound.