Revert "Merge pull request #43 from greboid/master"

This reverts commit 6eab54b937e714cea86b6f1bec44c9ad5aa81886, reversing
changes made to 8ca19b6cfb1cbf81cd17504c7d68e070f50a1cd7.

This seems to cause a lot of NPEs on startup that I don't have time to debug right now.