Revert "Take off the including of contacts in aspectscontroller.  Cross your fingers for a performance boost."

This reverts commit 7baeaebe.