Can we get rid of this and just use delegate directly or not until AF7?