Revert "Align on 5.9.1-SNAPSHOT" because alignement requires NXP-12623

This reverts commit 7c2e8c1232811addd91cd7b8e3cecdf208ef59e8.