Not without hacking smali and implementing this:
https://github.com/gtg465x/unnamed_rom/commit/89d4ef9d2fa13398caf5c7a178bceaaa229496d0
You forget that our stock ROM had the same problem.
As it is a ROM-specific issue, it is out of the scope of Hellraiser.