For all usages, it looks like this was unnecessary.
Not yet working
This reverts commit 4a064da30f.
4a064da30f