Moving to staging, as it causes lots of rebuilds and it doesn't seem urgent. This reverts commit d6fb907269, reversing changes made to 600b02324c.
d6fb907269
600b02324c