Likewise, please amend the commit to remove this change. I'll implement this separately in a fashion similar to what I did for ODM: https://github.com/doctrine/mongodb-odm/commit/4fe7d418353ba91cce02401ecc7ef72dece27ed9