Reverting previous incorrect change as well as fixing a PA timing issue