API change
Another API change
API change, and reinstate the mini-essay.
Merge bug25937