Please stabilize. Bug 402751 need not block.
Forgot to CC arches here, closing in favor of bug 415875.