Revert "Add bug fix"

This reverts commit 85262da93ff6615669eee5a9f69f1a6cfaad08ff.
More correct fix based on collection mapping information