Prepare switch to mozilla87

Edited by Matthew Finkel