This reverts commit 9117985b in favor of
a more general solution.