This reverts commit 67c5cb23e9, reversing changes made to 431c004fbd. I failed to notice that this depends on a package that had since been removed. My bad :(
67c5cb23e9
431c004fbd