Bug 905879 - More robust tier tracking; r=glandium