Revert to old style titles, needs further testing