Switch to new Intercessor way.