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