PAC stuff in the right place...

Change-Id: I21a55c2286f85aafa29b93c449a26581a75ea160