rolled back to CanCan 1.6