Fix reordering entries in a collection named literally collection

[jasonvarga]

This basically reverts #4978 and fixes #4495.

#4978 only seemed to fix the problem when the collection had the word collection within it. e.g. my_collection. However it was still broken when the handle was literally just collection.

Removing the "fix" makes it works for all scenarios:

• Handle named literally collection
• Handle with collection in it, like my_collection
• Completely different handle like pages

Something else in the codebase must have resolved #4495 since the issue was originally opened.

Added test coverage to prevent another regression.