Changes so it'll work on FF25.