Pending 2.6 changes (pbrant)