Revert "A dirty workaround for colliding package names", not needed in current puppet versions

This reverts commit bea6958dfa153b718afe9a5e7bbad2dbf5ac466d.