This patch depends on another patch that hasn't landed yet. This reverts commit 2a657e55a9.
2a657e55a9