Commented code did not work the same way than the code of the other adapters, should I rollback this change ?