One small remark: removing the "shortcut" doesn't work as then follow up issues like two representations of the same collection occur in our product stack.