DIAF replacing things that don't need it?

Change-Id: I7bd29e24b9748be3b0c753bd93b4d7d70d17a04a