This reverts commit 350b256722. Reason: buildbots were failing to compile new FF because their cbindgen was outdated. This is now fixed on both Mac & Win.
350b256722