This reverts commit 449eacbe01, which reverted 99f3df2893.
449eacbe01
99f3df2893
KEEP_INTERMEDIATES=yes