This reverts commit 14e3650f. The issue causing the revert were fixed independently in a08c90a4 and 14e5f978.