Revert "Merge pull request #15 from rkoster/fix-broken-catalog-update"

This reverts commit d785db0e5f4eb4bc13169225fb3828efca8471bd, reversing
changes made to 77c61f9f43b499991de0cc25d6b3cfb74b58e10f.