I've added a new PT ticket for this