Putting in temp fix for AOP manager.

May need to rethink how aggressive AOP manager is.