Revert to gecko1_8