Revert item duplication causing patch 58f036ad1 (which tried to fix objects getting hidden from client) and fix the original problem correctly