This reverts commit 14a8aa61. Mistakenly landed this before a patch it should depend on was accepted.