Another PITA removed.