Revert "LPS-41495 SF"

This reverts commit e70fbfdd73150a515f6967fefcf519fd90ea07c7.
Revert "LPS-41495 Avoid countWithDynamicQuery methods change the projection of a dynamic query if the developer doesn't provide it explicitly."

This reverts commit 7881f05787f7bb9abbc4d4bce2d7eeaa95bd6847.