Compatibility with been commit c2688f8c09dd58cf683252628ef00a5ea9876312.