This reverts commit 286c836b3f. It's bigger rebuild than I expected, I'm sorry. Moving to staging.
286c836b3f