Still playing with time zone issues for AP - albeit on the wrong branch.