Closing this bug, since this will get pushed in the next staging cycle
instead.