This reverts commit 215cef2236. This is a large rebuild on Linux and so should go via staging.
215cef2236