Revert "Revert this commit for Cortex 9!"

This reverts commit 97351b6b95fd60f6d95349545d0d57421af75dd8.