This reverts commit c8bc18bc. Moving to staging - it's quite a large rebuild (7-8k per platform), which probably wasn't noticed; the change doesn't seem urgent.