Possibly working solution for A7/A15 support w/o breaking A9.