This reverts commit 6d150873e8b4c23d694b0351570de323b1576d76. Depends on a core commit that was reverted.